Weed update #5924
Weed update #5924
Conversation
github-actions
bot
added
Sprites
| else | ||
| affected.updatehealth() | ||
| if(prob(15) && (affected.coughedtime < world.time)) | ||
| affected.coughedtime = 1 |
There was a problem hiding this comment.
world.time will always be < 1
also use a COOLDOWN_ macro
| var/puff_cooldown = 10 SECONDS | ||
| var/can_puff = TRUE | ||
| var/datum/effect_system/smoke_spread/smoke |
| set category = "Smoke" | ||
| set src in usr | ||
| var/mob/living/carbon/human/smoker = usr | ||
| var/datum/effect_system/smoke_spread/smoke = new /datum/effect_system/smoke_spread/weed |
There was a problem hiding this comment.
why create a new var when smoke is already on the object?
| if(smoker.wear_mask != src) | ||
| return | ||
| if(!can_puff) | ||
| to_chat(smoker,SPAN_NOTICE("Your lungs lack fresh air, chill man.")) |
There was a problem hiding this comment.
add spacing between a comma and the next entry
| to_chat(smoker,SPAN_NOTICE("Your lungs lack fresh air, chill man.")) | ||
| return | ||
|
|
||
| if(icon_on == "blunt_off") |
There was a problem hiding this comment.
this is gross and you shouldn't be checking icon states to see if something is true/false
| var/image/IMG = image('icons/mob/hud/actions_xeno.dmi', button, "shift_spit_acid_glob") | ||
| button.overlays += IMG |
There was a problem hiding this comment.
can you not set this on the action itself?
|
|
||
| /datum/action/item_action/hotbox/New(mob/living/user, obj/item/holder) | ||
| ..() | ||
| name = "Puff" |
There was a problem hiding this comment.
why are you setting this in New() instead of on the action?
Co-authored-by: Birdtalon <[email protected]> Co-authored-by: Zonespace <[email protected]>
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
About the pull request
Makes space weed recognizable with new sprites and actually more impactful to the game.
Space weed now has some charm as users can puff a cloud of smoke, causing people around them to suffer from secondhand smoke at the cost of a large cooldown and significantly shortening the life of their boof.
Explain why it's good for the game
MPs now can actually spot and see space weed being used by marines as it's sprite is unique now. Drug users can puff smoke which gives a small second hand smoke effect to people nearby while significantly impacting the smoke time.
It actually makes so MPs can actively look for the devil's plant rather than slapping it as an add-on charge when someone is already in custody.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑 totalepicness5
add: New ability for space weed smokers to puff a cloud of smoke at the cost of burning a lot of the blunt. Watch out MPs!
imageadd: Space weed now actually has it's own sprites
/:cl: